From 7c474c689a754ad40e7e3367271ae068eff9ebb0 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 4 Nov 2016 00:17:57 +0100 Subject: [PATCH] wayland: Remove all mentions of visuals --- gdk/wayland/gdkglcontext-wayland.h | 1 - gdk/wayland/gdkscreen-wayland.c | 57 ------------------------------ 2 files changed, 58 deletions(-) diff --git a/gdk/wayland/gdkglcontext-wayland.h b/gdk/wayland/gdkglcontext-wayland.h index bd2bb88457..4908ba7968 100644 --- a/gdk/wayland/gdkglcontext-wayland.h +++ b/gdk/wayland/gdkglcontext-wayland.h @@ -24,7 +24,6 @@ #include "gdkglcontextprivate.h" #include "gdkdisplayprivate.h" -#include "gdkvisual.h" #include "gdkwindow.h" #include "gdkinternals.h" #include "gdkmain.h" diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c index 5004438fc5..a9af78f9f7 100644 --- a/gdk/wayland/gdkscreen-wayland.c +++ b/gdk/wayland/gdkscreen-wayland.c @@ -23,7 +23,6 @@ #include #include #include "gdkscreenprivate.h" -#include "gdkvisualprivate.h" #include "gdkdisplay.h" #include "gdkdisplay-wayland.h" #include "gdkmonitor-wayland.h" @@ -58,9 +57,6 @@ struct _GdkWaylandScreen GdkDisplay *display; GdkWindow *root_window; - /* Visual Part */ - GdkVisual *visual; - GHashTable *settings; GsdXftSettings xft_settings; @@ -98,8 +94,6 @@ gdk_wayland_screen_finalize (GObject *object) if (screen_wayland->root_window) g_object_unref (screen_wayland->root_window); - g_object_unref (screen_wayland->visual); - g_hash_table_destroy (screen_wayland->settings); G_OBJECT_CLASS (_gdk_wayland_screen_parent_class)->finalize (object); @@ -607,55 +601,6 @@ gdk_wayland_screen_get_setting (GdkScreen *screen, return FALSE; } -typedef struct _GdkWaylandVisual GdkWaylandVisual; -typedef struct _GdkWaylandVisualClass GdkWaylandVisualClass; - -struct _GdkWaylandVisual -{ - GdkVisual visual; -}; - -struct _GdkWaylandVisualClass -{ - GdkVisualClass parent_class; -}; - -GType _gdk_wayland_visual_get_type (void); - -G_DEFINE_TYPE (GdkWaylandVisual, _gdk_wayland_visual, GDK_TYPE_VISUAL) - -static void -_gdk_wayland_visual_class_init (GdkWaylandVisualClass *klass) -{ -} - -static void -_gdk_wayland_visual_init (GdkWaylandVisual *visual) -{ -} - -#define GDK_TYPE_WAYLAND_VISUAL (_gdk_wayland_visual_get_type ()) -#define GDK_WAYLAND_VISUAL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_VISUAL, GdkWaylandVisual)) - -/* Currently, the Wayland backend only ever uses ARGB8888. - */ -static GdkVisual * -gdk_wayland_visual_new (GdkScreen *screen) -{ - GdkVisual *visual; - - visual = g_object_new (GDK_TYPE_WAYLAND_VISUAL, NULL); - visual->screen = GDK_SCREEN (screen); - visual->type = GDK_VISUAL_TRUE_COLOR; - visual->depth = 32; - visual->red_mask = 0xff0000; - visual->green_mask = 0x00ff00; - visual->blue_mask = 0x0000ff; - visual->bits_per_rgb = 8; - - return visual; -} - GdkScreen * _gdk_wayland_screen_new (GdkDisplay *display) { @@ -667,8 +612,6 @@ _gdk_wayland_screen_new (GdkDisplay *display) screen_wayland = GDK_WAYLAND_SCREEN (screen); screen_wayland->display = display; - screen_wayland->visual = gdk_wayland_visual_new (screen); - screen_wayland->root_window = _gdk_wayland_screen_create_root_window (screen, 0, 0); -- 2.30.2